Merge commit 'upstream/0.3.0'
authorKan-Ru Chen <koster@debian.org>
Sat, 17 Dec 2011 08:37:02 +0000 (16:37 +0800)
committerKan-Ru Chen <koster@debian.org>
Sat, 17 Dec 2011 08:37:02 +0000 (16:37 +0800)
commit997b9ae3e1e825f4bd7cd0ca3965dd8d8a624910
tree4ab3a77da47cecb01d62584bf1215b1d1fe66074
parent5428344f8215f38e1e1b3bc1092d7a9778fbc0c4
parent6707b885261bd73e2954c5e12f2966920b0014e6
Merge commit 'upstream/0.3.0'